Merge branch 'promotion-program' into feature/all-promotion

2 files changed, 6 insertions, 5 deletions

diff --git a/src-migrate/pages/api/product-variant/[id]/promotion/[category].tsx b/src-migrate/pages/api/product-variant/[id]/promotion/[category].tsx
index 50671afd..8da0d9a3 100644
--- a/src-migrate/pages/api/product-variant/[id]/promotion/[category].tsx
+++ b/src-migrate/pages/api/product-variant/[id]/promotion/[category].tsx
@@ -8,10 +8,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   const category = req.query.category as string
 
   if (req.method === 'GET') {
-    const queryParams = new URLSearchParams({
-      q: `product_ids:${productId}`,
-      fq: `type_value_s:${category}`
-    })
+    const queryParams = new URLSearchParams({ q: `product_ids:${productId}` })
+    queryParams.append('fq', `type_value_s:${category}`)
+    queryParams.append('fq', `active_b:true`)
 
     const response = await fetch(`${SOLR_HOST}/solr/promotion_program_lines/select?${queryParams.toString()}`)
     const data: SolrResponse<any[]> = await response.json()
diff --git a/src-migrate/pages/api/product-variant/[id]/promotion/highlight.tsx b/src-migrate/pages/api/product-variant/[id]/promotion/highlight.tsx
index 8153f346..c4acacf1 100644
--- a/src-migrate/pages/api/product-variant/[id]/promotion/highlight.tsx
+++ b/src-migrate/pages/api/product-variant/[id]/promotion/highlight.tsx
@@ -16,7 +16,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     let programs: any[] = []
 
     for (const type of types) {
-      queryParams.set('fq', `type_value_s:${type}`)
+      queryParams.set('fq', `type_value_s:${type}`) 
+      queryParams.append('fq', `active_b:true`)
+
       const response = await fetch(`${SOLR_HOST}/solr/promotion_program_lines/select?${queryParams.toString()}`)
       const data: SolrResponse<any[]> = await response.json()
       programs.push(...data.response.docs)